(comment-region): Force `lines' when `block' is set.

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index b161b0c777986b81dca2382c0229008e483589ed..8f7333a3e31baa36f6c93a6ee56371e434489ee0 100644 (file)
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -865,8 +865,8 @@ The strings used as comment starts are built from
                    (>= (point) beg))
             (progn (goto-char end) (end-of-line) (skip-syntax-backward " ")
                    (<= (point) end))
-            (or (not (string= "" comment-end)) block)
-            (progn (goto-char beg) (search-forward "\n" end t)))))
+            (or block (not (string= "" comment-end)))
+            (or block (progn (goto-char beg) (search-forward "\n" end t))))))
 
     ;; don't add end-markers just because the user asked for `block'
     (unless (or lines (string= "" comment-end)) (setq block nil))